From: Vincent Danjean <vdanjean@debian.org>
Date: Sat, 25 Oct 2014 20:32:40 +0000 (+0100)
Subject: fix-configure-for-debian-archs
X-Git-Tag: archive/raspbian/1.6-3+rpi1~1^2^2^2^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9dcf9f7b82001caeb83c4768c269cdc73ea2f7da;p=pocl.git

fix-configure-for-debian-archs

Fix architecture name for ARM on Debian

Gbp-Pq: Name fix-configure-for-debian-archs.patch
---

diff --git a/configure.ac b/configure.ac
index a14474b..10044d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -830,17 +830,17 @@ case $host_cpu in
       HOST_AS_FLAGS="$HOST_AS_FLAGS -mfloat-abi=hard";;
     esac
     ;;
-  armv7*)
+  arm*)
     AC_MSG_NOTICE([using the ARM optimized kernel lib for the native device])
     # check for gnueabihf, and set clang target accordingly
     case $host in
       #armv7l seems a popular host_cpu in distros. Clang uses "armv7", though
-      armv7l*gnueabihf)
+      arm*gnueabihf)
          llc_triple="armv7-unknown-linux-gnueabihf"
          HOST_CLANG_FLAGS="$HOST_CLANG_FLAGS -mfloat-abi=hard"
          HOST_LLC_FLAGS="$HOST_LLC_FLAGS -float-abi=hard"
          HOST_AS_FLAGS="$HOST_AS_FLAGS -mfloat-abi=hard";;
-      armv7l*gnueabi)
+      arm*gnueabi)
          llc_triple="armv7-unknown-linux-gnueabi"
          AC_DEFINE([HOST_FLOAT_SOFT_ABI], [], ["basic and pthreads devices use soft-float ABI"])
          HOST_CLANG_FLAGS="$HOST_CLANG_FLAGS -mfloat-abi=soft"
@@ -869,6 +869,11 @@ case $host_cpu in
     HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
     CL_DEVICE_ADDRESS_BITS=64
     ;;
+  aarch64*)
+    AC_MSG_NOTICE([using the aarch64 optimized kernel lib for the native device])
+    HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
+    CL_DEVICE_ADDRESS_BITS=64
+    ;;
   i?86)
     AC_MSG_NOTICE([using the x86 32bit optimized kernel lib for the native device])
     HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
@@ -886,7 +891,7 @@ case $host_cpu in
     AC_MSG_NOTICE([using the ppc64 optimized kernel lib for the native device])
     HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
     llc_triple="powerpc64-unknown-linux-gnu"
-    CL_DEVICE_ADDRESS_BITS=32
+    CL_DEVICE_ADDRESS_BITS=64
     #TODO: not all PowerPCs have Altivec?
     HOST_LLC_FLAGS="$HOST_LLC_FLAGS -mattr=altivec"
     CLANG_MARCH_FLAG="mcpu"